auto merge of #485 : alexcrichton/cargo/fix-for-rustc-master, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 29 Aug 2014 19:04:34 +0000 (19:04 +0000)
committerbors <bors@rust-lang.org>
Fri, 29 Aug 2014 19:04:34 +0000 (19:04 +0000)
Extending #479 to use a `'static` shell instead of a `'a` shell.


Trivial merge